am cdf44421: am bee8ec25: Merge "Prevent NPE when no indicator is specified. Bug #3362349" into honeycomb

* commit 'cdf4442188158ac5c7e66b379c6d90b6e7459f5e':
  Prevent NPE when no indicator is specified. Bug #3362349