Merge changes from topic "am-18ada11e2b884023b918e69d1d743147"

* changes:
  [automerger skipped] Merge "Backup NETWORK_AVOID_BAD_WIFI setting." into tm-qpr-dev am: 988a8777 -s ours am: ccb248b5 -s ours am: d5e2510f -s ours am: 6baa4fec -s ours
  [automerger skipped] Backup NETWORK_AVOID_BAD_WIFI setting. am: c0e7e416 -s ours am: feb84b6f -s ours am: cb3f184b -s ours am: bf7cca55 -s ours