Merge "WriterTest: handle asserts in getInputBufferInfo()" am: b1d2e747ed am: 6712360974

Change-Id: I9140214eb93bacaf223dfe274f4e1a9e8c9e4623