Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev am: 59266eec4e am: 7b68411de0 am: 518969b8cc
am: 7751e1a2f1

Change-Id: I3e5bcf45a95057cd29cb9819eae972a7f847aac0