Merge "Update the network unavailable message when selection fails" into nyc-dev
am: 6d7730c689

* commit '6d7730c689fb0187d2810ab6b73688043201188f':
  Update the network unavailable message when selection fails