Merge "Replace AppGlobals @hide APIs"