Merge "Use provided style for fallback font selection" into oc-dev
am: 43112fd26e

Change-Id: I15c19e1f5ff7919895af967f3ebf2d9564e0ce89