am 9030daba: am 2d7df3ef: am d66d4d1b: am 627975fc: am 74890df7: (-s ours) am 3cb7e91f: am 199c74ea: Merge "DO NOT MERGE. Truncate and ellipsize app name if too long for dialog." into lmp-mr1-dev

* commit '9030dabad5d0545a7e24d514c4e0cad570ca09af':
  DO NOT MERGE. Truncate and ellipsize app name if too long for dialog.