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

Change-Id: Ia352b7bab099be2e9aa15afaaef33d8de6b95fcc