DESCRIPTION

CBQE-4289: Fixing merge failures

Change-Id: I2d4919cd25415aa6750d0341a0ff199a19b93096


COMMENTS

author: Adelaide Rodgers
date: 2017-08-31 00:07:13.275000000

Uploaded patch set 1.

-------------------------------------
author: Adelaide Rodgers
date: 2017-08-31 00:07:40.330000000

Abandoned

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