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

Change-Id: If4f09f8a0e32c245552f025f1a61d67f842b1841