Use boolean instead of string

Change-Id: Ide82cfbcffb3ef2398ab2109f7b7c1241339bb26