Merge changes from topic "lshal_released"
am: 757fd44b93

Change-Id: Id1459c0576a5b016ed1b83ee482b96b57bfddb1e