Get rid of getPrefixedId in EntityIdPropertyUpdater

Change-Id: I4550bdb61a2a3285cde30a7cda03743d659789ff
Merge "Get rid of getPrefixedId in EntityIdPropertyUpdater"