Merge "Fix local variables with null constant"