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

Change-Id: I4c70be454a8e8cda7ede3460f78e8f3579b7a566