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

Change-Id: Ibb7e88f5ff4408656485c59562e8b9181b28c3bb