DO NOT MERGE: Ensure the target sees a proper EOD marker during restore am:...
DO NOT MERGE: Ensure the target sees a proper EOD marker during restore am: c42f1bb3 -s ours am: b3315881 -s ours
am: e758fd33
Change-Id: Iec96444bd7df8834fdc45e78841334a079bcac5e