Merge "Keystore 2.0: Revise Legacy wrapper error handling"