Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am: 7c36c95b19 am: 4e3aea6a85 am: 4390796eeb am: 511cbadc98 am: b5ae909c74 am: 890ef9f40f am: 259925187b am: 0b0aa0d48c am: 369715d47f am: ab970613d4
am: 8780f54877

Change-Id: I8e0e1217dcd973cea7a4064be7bbd85662b05ce9