Merge "Keystore 2.0: Respect input consumed."