Merge "rename roaming notification" into pi-dev
am: 7938770f9c

Change-Id: I7b67c1f05abda228c3093db8d3a61848a022a4fe