Get rid of empty if-statements

Change-Id: Ie1a6a8e60bcb7affd4c8fe7432d6bb93ca499637
5 files changed