Merge "Update policy/distribution config & image version"