Merge \"Avoid writing too much new data per transfer\" into nyc-mr1-dev
am: 21e6dde63c

Change-Id: I4d9fae702e81cea01a0a602247e629e71dd4efc7