Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev
am: 54e6518fc8

Change-Id: Ic02b8506afbd900d1fec0946148cd8f1a76ee5ce