Merge "base: Avoid compilation error when compiled with -Wdangling-else."
am: 80b1b18

* commit '80b1b188281b0c89e94cd9c3c3f2b04f007d6b28':
  base: Avoid compilation error when compiled with -Wdangling-else.