Fix broken tests in CP2

Change-Id: I1c198cbf086c7f267178a26d2a50123a8edaec12
2 files changed