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

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