Fix build: breakage due to merger

Change-Id: I2cdbe51aa4fd333565ee639d33b5528bde72dad9
1 file changed