Merge "WifiInfo: Rename getters"