Merge "DO NOT MERGE Move LMS to ease merge conflicts" into rvc-dev am: 539133b18a

Change-Id: I5f779461106430411aaffa2b43ab9c9fa85d47c3