Merge "Refactor to use EncryptionPolicy everywhere we used to use raw_ref" am: fda79ddd am: 7c3b0af0 Change-Id: Id0b36a8bd1d7db487eb61823f27c5349581bf781