am 2d745a84: Fix CP2 Unit test failure

* commit '2d745a84f01381ac24d703f992cfb66f65093d0e':
  Fix CP2 Unit test failure