Fix override_device

Change-Id: Ia69e175d14a2b4232ea8f99981a4249c222ac565