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

Change-Id: I6cc2d24337e28134f741e0d44547047a3bd5cd1a