Use actual …::class references instead of strings
Change-Id: I60cebcd07eb1219f986fba47349b39f8adf3b16a