Merge "Fixed crash when broadcasting any data intents" into oc-dev am: 03e7c899e6
am: cb326a4de9

Change-Id: Ia0e9c29b73e761d442d44ce7578bd5d752eea927