Support ignoring penalty for bad wifi networks am: c8e9e1229a
am: c53b5964f8

Change-Id: Ideee96cc5fc1631cfbc90cd9a59f34a2d5fde160