[automerger skipped] Delete time/position in InjectDelete instead of Delete_all am: 66fb7a1b88
am: f40bb22a0d  -s ours

Change-Id: I8ac1a0bb39d5751379885f14e767861928bb4af3