Merge "Remove backport dependency"