The current opportunistic way breaks if you're trying to pass bools. Change-Id: I4a79d9dcbc4234bd606a430cfe1c88c8650108e8