Merge "Fixing NPE in device policy tests" into cw-f-dev