Merge "Allow input_data on keystore finish."
am: 58a82a6a71

Change-Id: I3d0a59d0c2e547bfa997a4d5ee362ad7ce9acb07