Merge changes from topic 'bad_wifi_checkbox' into nyc-dr1-dev
am: 59266eec4e

Change-Id: I3cd85b815b1202b9291eacc986b131a020fefcd3