Merge changes from topic "iwlan_api" am: 83181d80c8 am: a98b285b56
am: a8ae91bd4d

Change-Id: I7e84a7c043013a833a893e0c818e9a6d3141e3e4