Merge "Revert "Update hidden API membership of intrinsics"" into pi-dev