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