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

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