Use PropertyId instead of EntityId in PropertyInfoTableBuilder

Change-Id: Iaadab3130cda7175bd22460528f04391001391b8
Merge "Use PropertyId instead of EntityId in PropertyInfoTableBuilder"