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

Change-Id: I08f4d5709d9670067dea9f94c05571d3998d2a4d