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

Change-Id: I404bc6187614d126059c77ec020d5c114a4bc3de