Signed-off-by: Stephan Bergmann <sbergman@redhat.com>, plus trivial
modifications for -Werror,-Wlogical-op-parentheses and loplugin:bodynotinblock

Change-Id: I149681b3743eaf96e98419bd568f88b451e9ba01