Merge "Use ServiceState to get data cell ID"