[automerger skipped] Fix wrong assumption on boolean type.
am: 82d6472c8f -s ours
am skip reason: change_id I8c97b17309d6e5b0eeed321d02eb83c96cc07768 with SHA1 eb104c8f28 is in history

Change-Id: Iac31c4222af72732c99bbfdcd88668641873880d