base: fixed merge derp

Change-Id: Ib92927fad0078a9c96f701fcfdc1362d7875b8d2