Merge "Resolve requested deferral policy based on caller." into udc-dev