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

Change-Id: I75648d04bc5cd61e977b0b2a73e2413f26762f08