Merge "KeyMint: allow extra error code" into main