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

Change-Id: If32d7c1459710e4f584be7740e8de785337dd54b