Merge "Improve the policy model download"