Merge "Make the output CryptoInfo.iv non-null" into rvc-dev