Merge "Replace fonts of unknown origin" into oc-dev
am: 3eae564fec

Change-Id: Ied313294ca2de00f654e0c912717286f2725cc18