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

Change-Id: Ibaf29ef631ff55e699c03c685d2298ade8c84afb