Merge "Support ignoring penalty for bad wifi networks" into nyc-dr1-dev am: def7f619 am: cdf48a5f am: ac004466 Change-Id: Ic820cf537eabb7375527d1062a3de6fd6fd80829