Merge "Fix stack-buffer-overflow detected by AddressSanitizer." am: 1d8995aa9c am: bd38f6f4f8
am: 97e98f18b7

Change-Id: I9bf7d8e447796196d44055a29936de3d68f9ece9