Merge "Remove deprecated Beam APIs"