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

Change-Id: Icae83108c9c067b5926178ef0e0150a287ac7d33