COMP: fix compilation errors

Change-Id: I7e712724ef7aaa3e518d84dc7fb396d0edc9f0e7
Merge topic 'COMPCreateVolume' into master

c488a1a8 COMP: fix compilation errors