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

Change-Id: I61cafc5362322d67c61c7d0ddffe3aeb96c5a8b4