Merge "Revert^2 "Remove deprecated Beam APIs""