Merge "Revert "Hide APIs not intended to ship in DR.""