GF-60073: Clean up boolean logic.
DCO-1.1-Signed-Off-By: Kevin Schaaf <kevin.schaaf@lge.com>