Merge "Clarify docs, sanity check roaming state." am: 419ec05284 am: 63b5615b2a
am: f8590d1f79

Change-Id: I59fbe09afc74e94e2f56cb6fd833fc2deb7023e5