Merge "Fix Boolean to integral types conversions." am: b0170f0 am: 0cf12a0
am: 77f03b9

* commit '77f03b993dee98d20a88eefbadfc09a9c916149a':
  Fix Boolean to integral types conversions.

Change-Id: I2bcf11a5ff927a63f5d7364d6575e9fd23335888