Merge "Don't add '(cherry-picked from commit ...)' if cherry-picked change is open"