Associate product properties with property categories.

Change-Id: I55d0e4c28f87e09daaa6dad2894545dc63be41c5