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

Change-Id: I600bc887488ddba6500c9be170f524e67fd15d62