Simplify boolean return

Change-Id: Id1a3904dd730e602c55dbf131d5f3ce788f8fbf5
Merge "Simplify boolean return"