Merge "remove extra semicolons [-Wextra-semi]"