Cherry picking commits for importing the statement_base_import module