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

Change-Id: Iec96444bd7df8834fdc45e78841334a079bcac5e