am 111a4135: am b9a40068: Merge "Failing test cleanup." into gingerbread

Merge commit '111a4135d84485eff85bbca6a96cd91886deb7ba'

* commit '111a4135d84485eff85bbca6a96cd91886deb7ba':
  Failing test cleanup.