DESCRIPTION

CBQE-4073/MB-22550:
same changes that were made in watson

Change-Id: I7e2ecbb4e29a100ce55547b80ee9177ded2b811b


COMMENTS

author: Jakobe Johnson
date: 2017-04-12 23:57:52.899000000

Patch Set 2: Patch Set 1 was rebased

-------------------------------------
author: Monique Barker
date: 2017-04-12 23:58:48.554000000

Patch Set 2: Code-Review+2 Verified+1

-------------------------------------
