update :class references

Change-Id: I241db27f9236d81f3b6c59066a97ce5742c8c0ea
Merge "update :class references"