Merge "Fix heap-buffer-overflow detected by ASAN."
am: 3d028f14c8

Change-Id: Ia3c137490fae9da00f73dedd414ba2b8cd04a975