Merge "Use ServiceState to get data cell ID" am: a75c52c3df
am: cedf4835ba

Change-Id: I5b66d8ab94ab0bb70ae153b9f0b1f2b28c66b08a