Merge "Send data warning intents with the current user" into qt-dev
am: f1f6146ed8

Change-Id: Ibca6cb2ebc72bfe33f4812d4c2f92af04a3de8d1