Cleanup in PropertyInfoTableBuilderTest

Change-Id: Id2e2ff1140e2f7395678bd2c349772a30886304e
Merge "Cleanup in PropertyInfoTableBuilderTest"