am e5b23381: am e043a74b: am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev

* commit 'e5b23381113b22feddb8d8339698bfdb1cf1656c':
  Bidi-wrap the results of format[Short]FileSize().