Merge "Fix 2535700: Strings for additional security policies."