am 99189120: Merge "Revert "Revert "Add further handling for when a CONNECT...
am 99189120: Merge "Revert "Revert "Add further handling for when a CONNECT incorrectly returns a body.""" into lollipop-mr1-cts-dev
* commit '99189120':
Revert "Revert "Add further handling for when a CONNECT incorrectly returns a body.""