Some cleanup in PropertyInfoTableBuilder

Change-Id: I9c3567de80b5934d8262031d4d0e92d03cfed84e
Merge "Some cleanup in PropertyInfoTableBuilder"