Merge "rename roaming notification"
am: 8ed3fe508e

Change-Id: I7090462c407ec928b55264f1fec0a46f336bee38