Change type of boolean parameters to int

I would prefer to use bools, but to be consistent with the rest
of the class, made boolean parameters ints.

Removed utility method used for convenience primarily in tests.

Change-Id: I00dd2afa6c3a06c8baa50bfef523cd520849e854
Temp commit

Change-Id: I47c300f742660d9e0f6f676a1479262c4abea8b5