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

Change-Id: I1604a238ea51deeb2bad74368ea65d2322e4ee8f