Use boolean instead of string

Change-Id: I9d9c3bc1b7ff88f59f7946fa17c6ae0dba0ba9e1