Fix build (bad merge)

Bug: 3101573
Change-Id: I2c0518e31f39c9a6e88d86cc468653bbcb5be05e
1 file changed