Merge "Clean configPolicy"