COMP / STYLE: Fix style warnings by Clang

Change-Id: I63a158ce1f3eec86c73299f392347506a56f9251
Merge topic 'ClangStyleWarnings'

e99a1f1 COMP / STYLE: Fix style warnings by Clang