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

Change-Id: I84e59606482fa9337b071d330de7f8a130f7e259