am 35624c17: Merge "Use bool instead of int"

* commit '35624c17973a941fe000026d899f065c1155021b':
  Use bool instead of int