Merge "Support ignoring penalty for bad wifi networks" into nyc-dr1-dev am: def7f61932
am: cdf48a5f69

Change-Id: I1742840c8d8ed8e6a236d6991263ef544502137f