Merge "Fix fonts following 455f1bfc05" into oc-dev am: 3b36051cb5
am: 74fe1c5055

Change-Id: I2cbc3f3a6acbd5c7f78d57a48f5e15d1e2dac358