Merge "Add service_contexts to policy update bundles."