Merge "Merge "Resolve requested deferral policy based on caller." into udc-dev am: 0177c5f2 am: 9c6336bd"