Merge "wifi: Fixing Nits"
am: 76cf857403

Change-Id: I4cfc3ba7771106a4efb801d5a9d40b4ae2cd4088