Merge "Notify user when user fails to connect to the network." into nyc-mr2-dev
am: 99291e8f35

Change-Id: I8d340854a4f46ddff8e1432396b9110e438215eb