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

Change-Id: I6ad59350420cb8462aa4935e8a0834ab14e003f5