Merge changes from topic "lshal_released"
am: 136c4bc7ab

Change-Id: I76d847e108f9826573202218fcf595b199856ec7