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

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