Fix wrong assumption on boolean type.
am: 82d6472c8f

Change-Id: I7f7e92d93406a9bea2034889339fae50a63f087f