Merge "Fix downcast that was using reinterpret_cast instead of static_cast"