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

Change-Id: I2791a1110afb102dd796fb1aa91068620884c860