fix merge derp

Change-Id: Id08119d8cc5e3f6fb57c385fbf0a161dfe002ed9