Merge "Use static_cast for NULL to pointer type"