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

Change-Id: Ic4a854139dfd7499909eb5ebea792d25da754e50