Merge "Fix bug found by fuzzer."
am: 1d6a3acc9e

Change-Id: I020589751d4b2835ac098dad8cc3b07c5ba8448d