Merge changes from topic 'lshal' am: 7e894fc94f am: c972254b58
am: fc025cd2aa

Change-Id: If5e30cbb533aa16de6b2f565104102ecec66c87a