Merge changes from topic "am-aa3beb9313d946ee82db16290a7accff"

* changes:
  Merge "[automerger skipped] Explicitly use overridden or non-overridden roaming state. am: 032c5355 -s ours" into udc-dev am: e3bd7336 -s ours am: 19138c72 -s ours
  [automerger skipped] Explicitly use overridden or non-overridden roaming state. am: 032c5355 -s ours am: f7e7cab4 -s ours am: 7d5e73bc -s ours