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

Change-Id: I8dfcb656041b7c69e132f367625e04c9e7eea351