Merge "Remove TYPE_OTP_CODE API" into main