DESCRIPTION

CBQE-4289: Fix merge testcases

Change-Id: Ia1a077b94cef3fbb2222a55f46493a713db5d0c5


COMMENTS

author: Adelaide Rodgers
date: 2017-08-30 06:16:09.077000000

Uploaded patch set 1.

-------------------------------------
author: Adelaide Rodgers
date: 2017-08-30 06:16:52.585000000

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

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