Merge "Font provider cleaning ups." into oc-dev
am: 5313eee98a

Change-Id: I5e6f0c61ca46a85e3ef19f8de3cb742b6a2ff91b