Merge changes from topic 'lshal' am: 7e894fc94f am: c972254b58 am: fc025cd2aa
am: 9fc5b8da62

Change-Id: I5004085481e0a46331dbc82272806678e940f290