am 246aad12: am 3d84280c: Merge "File writer has a designated writer thread now" into gingerbread

Merge commit '246aad12cf2becda5111d03fd1dd8f39712686f2'

* commit '246aad12cf2becda5111d03fd1dd8f39712686f2':
  File writer has a designated writer thread now