Update class ref

Change-Id: I5e7228f8fa94cc1f52ff9b65e71f67db814cca9c
Merge "Update class ref"