Merge "fix potential read null pointer" into tm-qpr-dev