Merge "Allow input_data on keystore finish."