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

Change-Id: Id981ebb3ec61209a4e4fe264ef6b1a193ebc0836