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

Change-Id: I85587a1eccc80443efb76853ec70ea339e422481