Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am: 7c36c95b19 am: 4e3aea6a85 am: 4390796eeb am: 511cbadc98
am: b5ae909c74

Change-Id: I2a34e07a5e122991d00d28163ed606ef89839eed