Merge "wifi: Fixing Nits" am: 76cf857403 am: 13dedb9197 am: 11239d83f5
am: 37113b92b7

Change-Id: I1b710e0b9212e262abc6bb9e6cd3fc41be1a8911