Merge "Replace Context @hide APIs"