Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev