Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8 am: 2ac51662c2" into oc-mr1-dev-plus-aosp
am: 3debaf9639

Change-Id: I4c3a0ba70d7270ff52e6eae2a9a68b593b4400b7