DESCRIPTION

Revert "Revert "CBQE-4204: Fix P0s in spock for merge""

This reverts commit 79b7162d927e4f886ea4db7720e73ddd59c127a2.

Change-Id: Icbd8642fa532808e1517e167372204812e560874


COMMENTS

author: Adelaide Rodgers
date: 2017-07-17 21:28:47.580000000

Uploaded patch set 1.

-------------------------------------
author: Adelaide Rodgers
date: 2017-07-17 21:31:02.572000000

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

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