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

Change-Id: I588805872f1443b25a9e4c50a30887d8a6b575e7