Merge "SFR sims should treat Spain as roaming" into nyc-mr2-dev
am: 66d545bfe9

Change-Id: I8019fc3e0b38f46191d3f8205a01727afaa9da3a