Merge "Support ignoring penalty for bad wifi networks" into nyc-dr1-dev