Merge "Remove unnecessary uses of reinterpret_cast."