Merge "Don't add "This patchset was cherry picked to ..." for the same change"