Merge changes from topic "may15" into sc-dev

* changes:
  Apply "attributionTags" to all component types.
  Apply AttributionSource during Intent delivery.