Merge "Resolve styles by font table if not specified." into oc-dev am: 1ea3a2600b
am: c000acd771

Change-Id: I7dc5268ddea18dfda560742b370388860dd87344