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

Change-Id: Ia3c2a115b3c925da1414703667efe39aaa594b46