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

Change-Id: Ib3a30b66546e77b1a926431bd32ed6b4a5f90a03