Update to accommodate variable fonts. am: 43206fc269 am: 4b863ae108 am: 0f6fee3ea5

Change-Id: I71f41b7c8203af62a0eeadc28e165554cf95a44c