Update policy files for Havana

Change-Id: I5426fbc90f18c1a896839385f642f97adbd14961
Merge "Update policy files for Havana"