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

Change-Id: I009fdce39cabfcf80b51117e844386e718bddbd2