am a4d76872: 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 'a4d76872864ef85a13ecda69938d907cc010d1fc':