Merge changes from topic "lshal_released" am: 757fd44b93
am: 880df0f744

Change-Id: Iff081ead4bb8dc83c2ba982627edacd22dc007dd