Merge "Fix bug found by fuzzer." am: 1d6a3acc9e am: 9bf73d3723
am: 9676de623d

Change-Id: I6b658d1920957ada615406530a09f313c1ed7178