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