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

Change-Id: Ibc08fbc8a2882aa3fdbccd16ef23c3f2bc84ff01