Merge "Revert "use HW Keystore""