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

Change-Id: Ie753fcbec56aab3a6718140a71a0d7e44e4a23dd