am bb8ecc78: am bb1f204c: am e9b0be19: Update CP2 unit tests for changed permissions

* commit 'bb8ecc785739c83127df41bb7ccf0b655dbcf9fa':
  Update CP2 unit tests for changed permissions