am 746ef9b8: am 2c507b92: Merge "Use a cached context when possible." into honeycomb

* commit '746ef9b8f0c080e247c6726b294fa2ab5cf53dac':
  Use a cached context when possible.