Merge changes from topic 'avoidbadwifi' into nyc-dr1-dev am: 291af5c5 am: 80f15e3b am: 6632944a am: 5ab84cff Change-Id: I755b7d340bb996a06bbfda41951b992d36f761a5