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

Change-Id: Idf4004f1cfb6b1b4c53d699f98faff5a55fc7b90