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

Change-Id: Id28b9734e27b62f2eb642a4193482e9026f8f3b7