Clean up l10n string wrapping (Bug 818321)
Port security policies to Bedrock (Bug 818321)