am 063b343b: am 65af56cf: Merge "Adding check to prevent NPE when we get a badly encoded install-shortcut intent. (3398526)" into honeycomb

* commit '063b343bebd189b8a95ac2e9e2dd6d30a8a343de':
  Adding check to prevent NPE when we get a badly encoded install-shortcut intent. (3398526)