Merge "Followup I4049b666: "Removing prefix exception for HTMLCheckMatrix""