Added EntityUpdater

Change-Id: I809273a8b21ff08522c9d9331b8f917478e51cc8
Merge "Added EntityUpdater"