Merge "Fixing NPE in device policy tests" into cw-f-dev
am: 67d9c792a8

Change-Id: I138f83d90318c9bb46a85b43b094aee62ce20b03