Factor out option variables from int to bool types

Change-Id: Ia897aa43e44d115bde6de91789b35723826ace22
5 files changed