fix merge derps

Change-Id: Ib56eb20d6decaf2f381e98181df471cc9f91b21f