DO NOT MERGE Move LMS to ease merge conflicts am: 1716a62ac1 am: ff4680f1e0

Change-Id: Ib7acfd71caae52904f74fbbb6c8b2b05469a072c