Merge "Fix occurrences of "-Wextra-semi-stmt""