Merge "Rename featureId -> attributionTag" into rvc-dev am: d7a82362 am: 3325b5a2 am: e0eefa26 Change-Id: I83e559f15c9501d0f61d3a00c28e9219238cac67