Hygiene: Anchor is a model class

Change-Id: I3f5bf50eb420bd36f665cb5d2c477a52857cd637
Merge "Hygiene: Anchor is a model class"