Merge "DO NOT MERGE Move LMS to ease merge conflicts" into rvc-dev am: 539133b1 am: c04bba95 am: e863e20b Change-Id: I47c561dc568c92540de87f0965798d5fa4d311c9