Merge "Keystore 2.0 km legacy wrapper: Fix finish."