Fix compiling

Change-Id: I8ab8cab545c0e2e6ae6f13096b9d2e58e852c17f
Merge remote-tracking branch 'git/Domination' into Domination