Merge "Replace various hidden APIs in SystemImpl." into main