Merge "WifiHal: Correct typo for code comment" am: 12ca95ccc4 am: 2ad166a35b
am: 29a52adadc

Change-Id: I579de2e0277ecf4a9bf720698359ca647345d53d