Merge "WriterTest: Fix bounds check"
am: 6409c17eff

Change-Id: I0462b8057b72655e9b9c9e656ffbec8c9d9b0292