Merge "Fixes to DrmConvertedStatus, DrmInfoStatus, and DrmSupportInfo classes"