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

Change-Id: I2b2c187a1a5d18c1e317366149859fedb2da1fd3