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

Change-Id: I410c1ad96a56905bd146f0730a3497458ab54e3b