Fix another merging derp

Change-Id: I9984833a62c809fc45678c4bf62d74ac0bee1320