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

Change-Id: Ic5a7b6352c0f1eb704943a3339939bf715ba210c