Fix first parameter in calls to super() to use the class-name in which super()
is being called.

Change-Id: I61ae35c3ada24b252a1a691330fc28f53b0ebce6