Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda am: 51c0c361a6 am: 51321907ce am: d671313b5d
am: 6ee17025d4

Change-Id: Ice88dd3019d8779bfa4111f024cb2a9714faf97c