Merge "Refactor handling of input records." am: 4248fc4628
am: a9cc522291

* commit 'a9cc52229178b1a393044aa5cb1918a6b56300e0':
  Refactor handling of input records.

Change-Id: Id1750970cdec8c1ed6baa509ef85360dcb9494bb