fix merge derps

Change-Id: Id4d5df7c025db931050b02db84764bc45871b2d0