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

Change-Id: Ibe4c10de6efea5b4ba79f41cef8ca7a7ed2aa371