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

Change-Id: Ic30d5aaadf2c59978162c53d7e7781847244ce52