Merge changes from topic "lshal_released" am: 136c4bc7ab
am: 3985d37c0d

Change-Id: Ida4d0337b681ee04092f4c58811324780d7af703