am a8a62569: am c688ddbd: am 0d166d87: am 1fa05179: Merge "Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)" into jb-ub-now-jetsonic

* commit 'a8a62569d6b1f898143fc1dbcc47a1f3c3131fd4':
  Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)