Merge "Stay on network during ongoing traffic" into oc-dr1-dev
tree: 90bd60983af5abe7bccafe81b9e63e49b3e17efb
  1. service/
  2. PREUPLOAD.cfg