Merge "BUG-2383: split out policies into separate files"