Merge "Allow for input_data on finish." am: fb2c9b1ee9
am: 3f2b9f1d9c

Change-Id: I5e370c1f6d24e13def39bb06380a9720058a5772