am cd8fc982: am 3c9ffc2d: am 2ebcf2c2: am ad0acf1d: am 9836b64f: am f68b1953: am 683cd049: resolved conflicts for 521def98 to lmp-mr1-dev

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