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