Merge changes I5c994de5,I6cb0dd84 into mnc-dev

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