Merge "Fix ContextTest and ContextWrapperTest Interaction" into gingerbread