Merge "Make data warning notification heads up." into nyc-mr1-dev
am: 36879a9d82

Change-Id: I8c5e00081e54134c61a5ca5fc9504e897f22f125