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

* commit '2171e2ab84baa41770489d01df9197a3ce871262':
  Simplify boolean condition compared to 0