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

Change-Id: Ic9a30e9bf8404c3a469bb0c998fd876ee94a3488