Merge changes I30f397b0,I717a6f03 into lmp-dev am: 1a242b67fe
am: 27ac4ac1da

Change-Id: Iee18a297b1c52c6c149846670b0e73cf5a23a53c