Merge "Add pillars with default policy configuration for OS services"