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

Change-Id: Id141089035f48fd9548661af672d865b492b24b4