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

* commit '4248fc46289f9940aa13d22e4f89abed5e74b169':
  Refactor handling of input records.

Change-Id: I8e52f4928fe46528b9c2a34b0cc607f7950630b3