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

Change-Id: Id060edb889116053c957a2527db8630625655db4