Merge "Fix long line: Workaround for request header values with trailing '\r' or '\r\n'" am: 23a4d310 am: 05367662 Change-Id: I35481af8c235c0552e9c4ad1730d131701bab2a7