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

Change-Id: Ifdd2da82fe629af4c81a3bf59a2b494a431c637f