Order in Device overrides

Change-Id: I334dfb3b17fe59142e5ec4bf3a7812252a97f73a