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

Change-Id: Ib1be74e18608e49276818f359c1f70ef68bfeea4