am 39eb41f6: Merge "Do not expect 0 or 1 only when comparing a boolean." into mnc-dev

* commit '39eb41f6ad5af18fb9225e5898f20e348e1a7d75':
  Do not expect 0 or 1 only when comparing a boolean.