Merge "Simplify boolean condition compared to 0" am: 2171e2ab84
am: 0af5e3b30f

* commit '0af5e3b30f2a118530c750943dd4de9b0a383aea':
  Simplify boolean condition compared to 0