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

Change-Id: I7a9299d098b7e30406cfa4713acba2e251ef7ec3