Merge "Stop loading other package's font by default." into oc-dev am: 824d75e0e1
am: ba12631bba  -s ours

Change-Id: If5124a045069500c2cf3c52da2533603de5e4816