Merge "Fix NPEs in DataCallResponse" into tm-qpr-dev