Fix build from merge derp

Change-Id: I9b5ca5570ff679f449dfaaa452dea4a2bf8d7174