am 5ef30799: Merge remote branch \'goog/gingerbread\' into manualmerge

* commit '5ef30799de8920baa38f61f27808c68efbce6de3':
  Backport from HC to Fix NetworkInfoTest
  Enhance the options check so that if we expect to see a null options bundle we accept a non-null but empty bundle as well.
  Farewell Magnetometer Test