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

Change-Id: I5bd96af50a56a54dc91ae3498c13137cbfc3d0ef