Update to accommodate variable fonts. am: 43206fc269

Change-Id: I14aedbdcf8fcb9268fb5fa1cb9f87ea5a6b0672c