DO NOT MERGE Move LMS to ease merge conflicts am: 1716a62a am: 9f123806 am: cdb6939e am: d842669a Change-Id: I4ffd8bef617ceba35eafa12ed89a0feb3a92ba61