Merge changes from topic 'lshal'
am: 7e894fc94f

Change-Id: Iede25dfbf58f71b56cec13733bd8f5ddbeb95c31