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

Change-Id: Ic921b344bc746298d1c77956104e18a379103f31