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

Change-Id: I25478f2bcb117ce916e83ae51f4ef0dabc87b72e