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

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