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