Fix wrong assumption on boolean type. am: eb104c8f28
am: 99cfbce65a

Change-Id: I21d52a0d97d52cbac058ab756dcdbad65b61e1e8