Merge "Rename featureId -> attributionTag" into rvc-dev am: ce7245e81d am: 689b15f67c am: 4e91ec236d

Change-Id: Id0d042907264345f5b458aa7f6b88a8cf92751b1