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

* commit '6b02362d5ff05df439c1ba12e212cffbe5a2252b':