Support property hierarchies.

Change-Id: Ia7a8dba6ee282c0e2c9700dbf788015fdc84791d
Merge "Support property hierarchies."