Merge changes from topic 'lshal'
am: c9bc03729b

Change-Id: I5051bdae873e53c21dcd6e949e7c47da4482a192