Merge changes from topic "lshal_released" am: 136c4bc7ab am: 3985d37c0d am: 0cc634548c
am: 1776f7562e

Change-Id: If83d5343b4c1eee91940874cc4cc8fc4d0bdb04b