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

Change-Id: Id263677c0aaff9eb1839107e3c3104e314a64c33