Merge "Remove deprecated noop functions"