Fix merge derp

Change-Id: I699f5c87812013ac195e5bfe8c7ca7858534cf82