am 4414e30a: Merge "Fix ContextTest and ContextWrapperTest Interaction" into gingerbread

* commit '4414e30a6e6c7be32bde09ac96dac3f20df3617d':
  Fix ContextTest and ContextWrapperTest Interaction