CB-4471: Mitigating Android 4.3 errors where data isn't being passed so NPE doesn't happen
Backporting CB-1605