Handle deletion programmatically always

Change-Id: Ic68f80d92d32169ff60258b81a438e342b136128
Merge "Handle deletion programmatically always"