Merge "Allow for input_data on finish."
am: 4a83b14ada

Change-Id: I7eb2836cac466b59cfffa6149993bd39519817e3