Merge "fix potential read null pointer"