Merge "Refactor to use EncryptionPolicy everywhere we used to use raw_ref"