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

Change-Id: Ia75b0e41239a31604319c2275ded0e0e95e2536c