am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and...
am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev
automerge: 35b5780e
* commit '35b5780e':
Refine resolution order for typeface and fontFamily