Merge "Update policy/distribution config" into staging