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

* commit '69a3ec5c23d2f60fc911408c865e9664d540590e':
  Fix CP2 unit tests