am b1e4e89b: Merge "Fix incorrect usage of bool"

* commit 'b1e4e89b86ee12335fa1398a6b2bc0a0604599de':
  Fix incorrect usage of bool