Fix usage of classmethod in various places

The decorator @classmethod isn't always correctly used in the code base,
this patches fixes some places where it was not used correctly.

Change-Id: Ifd4113b693889de0becc37854f4c62faf2fdab11
Merge "Fix usage of classmethod in various places"