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

Change-Id: Ia222c9d5826f873ba9d23b203d2ba88c5edf1e0d