Fix build breakage caused by a bad merge from master.

Change-Id: I2da195733b3c78fea2865b0bdc0b5a5bf9ec60fe
1 file changed