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

Change-Id: I107d04739dd34636b6fcda3eaf714725c711a88d