Fix wrong assumption on boolean type.
am: eb104c8f28

Change-Id: I91b17378f4d982684de81eac12abd7d3aedb4e8b