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

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