Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe am: 27ac4ac1da am: ac64c64f9a am: 618f64d183
am: d635edfd04

Change-Id: I89bbff14776bbdec62f465342818f95cf38a5b80