Merge "Keep DisplayAreaGroup and DisplayAreaPolicyBuilder in services.jar"