Merge "Rename featureId -> attributionTag" into rvc-dev am: da8418c0fd am: 021cd91fb5

Change-Id: Ib8cd23f43217c324c3cb6fb1ba45293e946c54ca