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

Change-Id: I735d29c3f09a3c8ebc44d11539aba836254502d6