Merge "Support WFC roaming preference" into nyc-mr1-dev