Merge "Let request-id value derive from alternative request-headers"