am 1ebfc31a: Merge "Fix WifiInfoTest" into gingerbread

* commit '1ebfc31a62d1096b5e07d23c8f50da8dc7402b00':
  Fix WifiInfoTest