am 04ebb4d1: am b60e2bef: (-s ours) am 99189120: Merge "Revert "Revert "Add further handling for when a CONNECT incorrectly returns a body.""" into lollipop-mr1-cts-dev
* commit '04ebb4d1':
Revert "Revert "Add further handling for when a CONNECT incorrectly returns a body.""