Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am: 7c36c95b19 am: 4e3aea6a85 am: 4390796eeb am: 511cbadc98 am: b5ae909c74 am: 890ef9f40f am: 259925187b
am: 0b0aa0d48c

Change-Id: Ic8a135578ccf3be62ead11a1f708b5b71ae52b2a