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

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