Fix a merge derp

Change-Id: I652f007eb11d416ac14364750c17c4166021115c