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

* commit '08a892ee7d3a04dae02671942e057a4e6ec2ae39':
  Update the network unavailable message when selection fails