Merge "Fix null pointer exception during initialization"