Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61
am: a34ba7f284

Change-Id: Ib1f877ea42a1603f7b53796997fb36600873bfee