Merge "Fix 3197205: Minor edits to device policy admin strings and documentation"