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

* commit '097f8d5f6b82f27e71ec72795dee053dfc698ac5':
  Update "Optimizing app X from Y string"