Merge change 2090

* changes:
  Fix bug #1863517: use the new signature for data message token in SubscribedFeedsIntentService.