Stop using deprecated methods in EntityChange

Change-Id: I1d576f9f942abb2eac04aa9b5fd3225fd5b449f3
Merge "Stop using deprecated methods in EntityChange"