Merge "Need to return false if addSkTypeface fails." into oc-dev