Merge "Prevent NPE when no indicator is specified. Bug #3362349" into honeycomb