Merge "Refactor to use EncryptionPolicy everywhere we used to use raw_ref"
am: fda79ddd82

Change-Id: I0d1599b8a2baa141e1d08029f75e5e54f486cb14