For convention rename the first classmethod parameter to cls

This is a follow-up patch on 9de2d21a96f440807b9822173de3fd3b6119fbe8

Change-Id: I043cc279dce7e2dbf9511a2f23c443c438affb51
Merge "For convention rename the first classmethod parameter to cls"