am 916dd596: am 244f1a3a: am 8128f7fa: Merge remote branch \'goog/gingerbread\' into manualmerge

* commit '916dd5960fc0e572415e3526ac0d9029c3b7d576':
  Backport from HC to Fix NetworkInfoTest