Properly limit attribute reference updating to just a given package ID.
Properly limit attribute reference updating to just a given package ID.

project-chip/zap,project-chip/zap,project-chip/zap,project-chip/zap