am 4d763df3: Merge "Fix a broken boolean test found by clang."

* commit '4d763df3243f81041269015d0ac3fbd2912d5f3d':
  Fix a broken boolean test found by clang.