Merge "Fix non-inclusive terms in framework device policy logic"