Merge "Fix NPEs in DataCallResponse"