Fix compilation error with new compiler

Change-Id: Ib9a62fe33a7dc8de50e5dfb174014c9fdd26be88
Merge "Fix compilation error with new compiler"