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

Change-Id: I10c77661a3a2f2bda137fbf56031292000ccd7a6