Merge "Omit X-Subject-Token from log"