Merge "FauxRequest: Avoid header leak"