Merge "Moving CryptoInfo creation for Unencrypted samples" into main