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

Change-Id: I1b5c1eceb88b57a50331340709c50507eb8f9bf8