Merge changes from topic "iwlan_api"
am: 83181d80c8

Change-Id: Ia232ee5c9cf4e6393ba093cc7a3723d71bc34af0