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