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

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

Change-Id: Ia40e09690a5c9a3ddd23bce7d56963567e804f7e