Merge "Add a per-boot-key policy reference"