am ac5cd96f: am dbab409c: Merge "Avoid two warnings from clang."

* commit 'ac5cd96fe24690d9e0ae823c77334b8579139aa2':
  Avoid two warnings from clang.