Merge "SFR sims should treat Spain as roaming" into nyc-mr2-dev