Merge "We really want f_frsize." into oc-dev