Merge "Support WFC roaming preference" into nyc-mr1-dev am: cfe950f6be
am: f36a101136

Change-Id: I30fe35ccb4cc9b3785c548f2c99db62b2009dbe8