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