Fix CP2 unit tests

Bug 27119132

Change-Id: I5eca1c91db5e7cab946d0011a0a62575991d038f
1 file changed