Fix bad merge

Change-Id: If360fd53b9fb9240db8328fc8a80b991984bc7e6