Do not use self in classmethod, cls should be used instead. Change-Id: Ib4e5b27e237122e519bdf84d2af1e8c0ea5f1dda