Merge "We really want f_frsize." into oc-dev am: 623912183d
am: f0a5d271b4

Change-Id: Ie1bd22bb85bdaec4434ffd22183f51c62145e4ce