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

Change-Id: I3fc04eaa4bcdc5ea751e45b7169b740089a8d7f5
tree: 316cb5b242b6442bace5af0ad037096a507a3be0
  1. service/
  2. PREUPLOAD.cfg