Merge "DO NOT MERGE Move LMS to ease merge conflicts" into rvc-dev am: 539133b1 am: 665983a0 am: 2e1a0996 Change-Id: I03d15a9491175957f69d1983caf70a83fa9a8138