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

Change-Id: I119bb6fb352d6c5ef60a3dda1143ec68eea13f13