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

Change-Id: I97499bd23070df1c2e96da7ac268c47a3b83251f