Merge "Check roaming network for Fast Re-Authentication" am: c707c6d7fb  -s ours am: 27c16b2ce2 am: 0765d6e87c
am: c232a21dc0  -s ours

Change-Id: Ic61b7811b98a333a57db87ef001c50c7970b709c