Merge "Revert "Remove deprecated Beam APIs""