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

Change-Id: I57c81f3755dc5966800277b9c8e94104ae3ae58e