We are receiving NoEmptyError while deleting recursively. For now, ignore the error. We may have to add retry for this error later

Change-Id: I82f66ad62db14f83ee00fc9d44b402a9c93c6d24
Merge "We are receiving NoEmptyError while deleting recursively. For now, ignore the error. We may have to add retry for this error later" into R1.06