Merge "Stop loading other package's font by default." into oc-dr1-dev
am: 1ef5cb531d  -s ours

Change-Id: I1e4aa0af645bd9dc34e0ebd0ad9ab091d2049aee