DESCRIPTION

CBQE-4289: Fixing merge failures

Change-Id: If5baa79da8332dcd8bf526e243987aaa8e75ca1d


COMMENTS

author: Adelaide Rodgers
date: 2017-08-31 00:09:50.629000000

Uploaded patch set 1.

-------------------------------------
author: Adelaide Rodgers
date: 2017-08-31 00:11:08.536000000

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

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