Merge "Do not translate system-reserved stream type names"