Properly escape $class as html attribute

Change-Id: I25d674013acc4b28e905cf93d9f0d37e690fd7c9
Merge "Properly escape $class as html attribute"