Fix bad merge

Change-Id: Ie3c2e28e8caee6fa553f073d2d1e238c030a0bdc