Merge "Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am: 54e6518fc8" into oc-mr1-dev am: b1e8d97867" into oc-mr1-dev-plus-aosp