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

Change-Id: Id70541af980dd26e2d5d3cb80f87690e6b50e717