Merge "Clarify docs, sanity check roaming state."
am: 119611ed11

Change-Id: Ic30d5aaadf2c59978162c53d7e7781847244ce52
tree: 4d1aca2a4aea289708234b93765619c1e3c1a3e3
  1. core/
  2. services/
  3. tests/