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

Change-Id: Id92e4d2d5236107f3d88bc300066bab747804be1