Merge "Update policy model for HPA policies"