Merge "IWLAN API review changes"