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

Change-Id: I969634a64ab09c5fe3672d96a44554de86fd4948