Merge \\"Ensure the target sees a proper EOD marker during restore\\" into nyc-mr1-dev am: 3fed75d404
am: 2d54ec0f31

Change-Id: Idc191143ba5c9a250e886d487a49d4a84506545d