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

Change-Id: Id7eb0255f356601697e7d35fa544d8986e60cc8d