Use correct root adapter factory for property descriptors.

Change-Id: I503312990fb8a0519bd8e230cb3783430725ddeb