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

* commit '2c507b92c242951e4fb2e807431c10d73e4bf778':
  Use a cached context when possible.