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

* commit '0cf12a0dc3e321a754fb921e79328b1f0c72f461':
  Fix Boolean to integral types conversions.

Change-Id: I951c3d54d7a63f80dd62231ffeee894c9c0ae5c7