Merge "Remove unnecessary null pointer initialization for class variables"