Merge "Add warning for slow file write"
am: 47bdf26065

Change-Id: I24ed4ac9d311bc0482a30c500fd11ae2c1f2db48