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

Change-Id: I3fc04eaa4bcdc5ea751e45b7169b740089a8d7f5