am de177d72: am cabd7cf8: Fix NPE in enterprise API & fix unit tests.

* commit 'de177d72ec5464e4f8339e20d4bf24cc915403c1':
  Fix NPE in enterprise API & fix unit tests.