Resolved issue with deletion

Change-Id: Ie40a6c2c685eaad3248be3ca66e3680eafa0a2d9
Merge "Resolved issue with deletion"