Update LKG.
Update LKG
Merge pull request #1522 from Microsoft/LKG2

Update LKG.
Merge branch 'master' into layering