Merge "Pass weight/italic pair instead of style." into oc-dev
am: b4e3b344fa

Change-Id: I9d430af9489878fd0c7eb8d26dce186a13059450