Use boolean instead of string

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