Merge "HWC: Fix for use int reference in function call"