definitions: Fix merge mismatch

Change-Id: Ia46d0f68bba102e76661ab079b5bd18d6efdf152