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

Change-Id: Ie5c7ca0fa73671116955272c66aa7611805f23ff