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

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