fixed bug where getEntityPath() was returning incorrect path.

Change-Id: I04a95adb71755bf9cd141db9f6015bf286c9607a