Merge "Don't invent your own boolean type (and then not use it)." am: 359559dbc7
am: ef0302e644

Change-Id: I91296ef39401239112de037f526279d36f6d259d