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

Change-Id: I223f4ecce8679753e61a4dde4b12cd9585abe2fe