Fix some warnings part2

Change-Id: Ic70ec3d18e999d05292a84e5df614aaec5d97cd6
Merge topic 'warnings1' into master

9a978a56 Fix some warnings part2