Merge changes Ifc80ff6e,I24314151 into rvc-dev

* changes:
  Prefer trusted networks to untrusted
  [ThroughputScorer] Simplify last-selected bonus
tree: aa0c188e2b66c63daf1f3fb183ee82c24e1e86c2
  1. apex/
  2. service/
  3. PREUPLOAD.cfg