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

Change-Id: I441ee0cf9dd18b79e7ba6472f9cfaf161bdc7cfd