Merge "Revert^2 "Activate KeyMint.""