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

Change-Id: Id889b111653e299b83b34929ef46ed515ab8fd49