Merge "rename roaming notification" am: 8ed3fe508e am: bfc36e6acf  -s ours
am: ddd767a481  -s ours

Change-Id: I42bf12b6e21c15fe326e74eacff50e203f036736