Merge "Edit workPolicyUtil constructor" into tm-dev