Use boolean instead of string

Change-Id: Ieb768a79d6b4fd4f574b71c51e64f828f8d3316b
Merge "Use boolean instead of string"