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

Change-Id: If17645f5461aeeebdcd4c76276571b8134d65dd9