Merge changes from topic 'lshal' am: 1f2d5a9cda am: 65b5fab397
am: cf41d3fa69

Change-Id: Ia11923e218c0594d2f67b95ec510fa80716d74e3