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

Change-Id: I2e8257384fc772940350173555eaf2f38f57c656