Merge "Fix overflow sanitizer in copyWithAuthor." am: 18977849c8 am: f99ca332b9
am: 2c331aa92a  -s ours

Change-Id: I4a8a3c0ee606a6f38f2190d77bb4a1c3a6d2943e