Merge "Fix NPE in PolicyControl."