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

Change-Id: Id75281df282cf6f0b77def2c7cffcc88ef92c417