Merge "Address comments from API council for Font/FontFamily"