Merge "Show a toast when switching from wifi to Verizon cell data." into nyc-dr1-dev
am: 5d06597072

Change-Id: Iaa541e5454184d047ea75548c480953ec2f7bbc3