fix some warnings

Change-Id: Ib8ee7e7dc4b9d29621b3906571c5341ece594676
Merge topic 'some_warning_fixes' into master

e1ef59ea fix some warnings