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

Change-Id: Id087fa11eeed08fb0f2faae1633dc8ec00eea68c