Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev am: 291af5c568 am: 80f15e3b4c
am: 6632944a01

Change-Id: I410b0d058e46b431b8064f6e54298bde65ab3f54