Merge "Plumb attribution tag to Sensor Service" into sc-dev