Cherrypick change from master moving LMS, so that merge conflicts will be easier to resolve. Bug: 153568386 Test: presubmits Change-Id: I8eba22622cc5f4d11c1a928b6cf3883cbf96caba
Cherrypick change from master moving LMS, so that merge conflicts will be easier to resolve. Bug: 153568386 Test: presubmits Change-Id: I8eba22622cc5f4d11c1a928b6cf3883cbf96caba