Merge "Fixed crash when broadcasting any data intents" am: 5b72ca6b8e am: a60a78a286
am: 61c69a8119

Change-Id: I27614ca8fe0c49538f49fb888583797ae5cf3243