Merge changes from topic 'lshal'
am: 1f2d5a9cda

Change-Id: If2ed2950dfa6f7a4598e143e9e22b34426a8f196