Merge "Migrate to upstream policy version 30"