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

Change-Id: I828cf45fa432b575a5069c54ec32fba2e9a5c337