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

Change-Id: If60836fda4e1e2214f8cb664079b23c9189a4a02