Merge "Fix unqualified-std-cast-call compiler warning"