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

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

Change-Id: I34afae48363ffedbf25537c82e03052281f10536