Merge "Minor refactoring in WorkPolicyUtils" into tm-dev