STYLE: Coverity 1080826-1080827: Logically dead code

Change-Id: I60ca295a6dd7409bf5f03412ebbe9a5bd959c71c
Merge topic 'cov_1080826'

f7cc196a STYLE: Coverity 1080826-1080827: Logically dead code