Merge "Replace fonts of unclear origin" into oc-dev
am: ac2a416a5b

Change-Id: I5592ae97240969a7cc68f38a1599c50bc03322f2