Fix build

Merge error...

Change-Id: I0e674ee25a080fa6abfaa9da893084d6b4fa69a6
1 file changed