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

Change-Id: Ia8fd72e24496825e234ecb20f48d71dafa21fca8