am 145f7821: am 2d745a84: Fix CP2 Unit test failure

* commit '145f78217867fd86ce0e14ea9fab622509027e56':
  Fix CP2 Unit test failure