Merge "Delete time/position in InjectDelete instead of Delete_all" into pi-dev
am: 6c72c271ad

Change-Id: I187ed820091218d057eff39714a6433b6943cb26