Merge "Fixes ROTPK hash generation for ECDSA encryption" into integration