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

Change-Id: Ib6375fdfa9295add1e4d53f220f3b8d22f48b855