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

Change-Id: If8aaccc666a8ae0c5b947c4fd49486c7a0f55389