Merge "Check roaming network for Fast Re-Authentication" am: c707c6d7fb  -s ours
am: 393bb59799

Change-Id: Ia8fd72e24496825e234ecb20f48d71dafa21fca8
tree: 5dd1de1c5ccb63efb1fab1e3455d10a355fc9358
  1. service/
  2. PREUPLOAD.cfg