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

Change-Id: I6b2c80df71e7b131ada618141db3cdec37d9e587