Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284
am: 72c26c936b

Change-Id: Icef58fd5f7788229efae42592c5f05ba086ce0a1