am 7b737c80: am 097f8d5f: Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev

* commit '7b737c809d95343ebf18d68dd9f503f5efe127be':
  Update "Optimizing app X from Y string"