Merge "Promise Request-id header: Check MDC value if no header"