Merge "Update "Optimizing app X from Y string"" into lmp-mr1-modular-dev