Merge "Cache the Typeface based on the FontRequest." into oc-dev am: 5b96e55d90
am: a121eabf99

Change-Id: Ib4e0860910b498cc8effb5b62b5642d0d9bbd39d