Bug 969298 - Part 2: Add roaming and roaming protocol fields