DO NOT MERGE Backport of I1f55df8a from master.

Fixes false reporting of NO_CONNECTION.
bug:4057115

Change-Id: Ie11e81180276ac3aa486607ec3a8eb1088b2ece6
1 file changed