Merge "New IDrm API return type"