Merge "Stay on network during ongoing traffic" into oc-dr1-dev
am: be249648a4

Change-Id: Ic5a7b6352c0f1eb704943a3339939bf715ba210c
tree: e81f61710c0d889fa864c1fb17535527d0e57353
  1. service/
  2. PREUPLOAD.cfg