Merge "replace hidden Context APIs"