fix merge derps

Change-Id: Ibedd0208630381d59a385ca859596eb6af8e4f5e