Merge "API: Use log context for api-feature-usage log"