Fix entity deletion updates for properties.

Bug: 71914
Change-Id: I9197222bbed21369bd881a0e9e8fc88301eaa967
Merge "Fix entity deletion updates for properties."