Merge "services/device/device: move devicex one level up"