Warning and comment fix

Change-Id: Ia50b9e839a9220cc4665a68edef5e5c8a0d23e4f
Merge topic 'fix-warnings' into next

d6ee68c Warning and comment fix