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

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