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

Change-Id: If65018427bcdce6e6faec5c42f53d1ae9e99cc28