Merge "Fix overflow sanitizer in copyWithAuthor."
am: 18977849c8

Change-Id: Ia25c4535d9eb948597f24c70440b0716948aa869