Merge "wifi: Fixing Nits" am: 76cf857403
am: 13dedb9197

Change-Id: I56c8b1d21466e1cc8efe7fc9a73a7bd80c952065