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

Change-Id: I93eb4512a850b49a432573e8f1ee018f770ffcee