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

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