Merge "Fix CP2 unit tests" into nyc-dev am: 69a3ec5c23
am: 0c967500a9

* commit '0c967500a9bc35c3b39133bf3ceba59bfbad6f5a':
  Fix CP2 unit tests