Merge "Fix failed enterprise unit tests in CP2" into nyc-dev
am: b2609837fb

* commit 'b2609837fb18f8b4871ce76d81aab2806b1d8074':
  Fix failed enterprise unit tests in CP2