Merge "Refactor to use EncryptionPolicy everywhere we used to use raw_ref" am: fda79ddd82 am: 7c3b0af05e am: 23fdbc7937

Change-Id: I73aac44990227e35352c8fa40a4dc2265c68fb04