Fix merge derp

Change-Id: I961b72acffc6e348191bad0731632d67ca84635d