Merge "Remove DeviceIndex feature/service."