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

Change-Id: Idf28d646ca10ff2724c213828c8f095dc4587f5a