am 62ca62b3: am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev

* commit '62ca62b32aae083c0f2d8b0bbec1fbd7d698f4ad':
  Add a test for public bugs 2111 and 2136.
  Always check off-link connectivity in NetworkDiagnostics.