Merge "Fix WifiInfoTest" into gingerbread