Saunalahti considered non-roaming on Elisa

Change-Id: I51b554cf578c6027d52ad6e111e41d269c1f579f
Merge "Saunalahti considered non-roaming on Elisa" into cm-11.0
Merge remote branch 'cm/cm-11.0' into cm-11.0