Merge "Fix fonts following 455f1bfc05" into oc-dev
am: 3b36051cb5

Change-Id: I802db3a0b82334bf214e2d887b3e7c83a39efdb4