am b380d7ee: am b1e4e89b: Merge "Fix incorrect usage of bool"

* commit 'b380d7eeee2ea73bcd2bfdf0b0b3339ab93ff75c':
  Fix incorrect usage of bool