DO NOT MERGE: Ensure the target sees a proper EOD marker during restore
am: c42f1bb3e9  -s ours

Change-Id: Ic2d1c391f6876a569eafe3850ceb5f048804105b