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

Change-Id: Icc0b977c607c47bd28f07e6fb67d02a3de3bedde