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 'c688ddbd94ef38bb7bb30e327fa3874ca38c7edb':
  Ensuring that we have a valid name for installed shortcuts. (Bug 11266005)