Merge "base: Avoid compilation error when compiled with -Wdangling-else." into nyc-dev