Merge changes from topic "iwlan_api_review" am: ac3406f9c6
am: 8a6dbb8446

Change-Id: Ie30207bae71e1c45a9d2ae76132c3012f9f5dd37