fix merge derp

Change-Id: Ie25b173018a38ca4f57ef9bda89184a08b9e85a1