Update to accommodate variable fonts. am: 43206fc269 am: 16eaf55bff am: 75adb50526

Change-Id: I2838a670bcc3ce69ce34f774a94857310e7d42d1