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

Change-Id: I2ba0c6be6d72a64436ab0e7846345a6a50e5c3d1