Include Description in conversion from legacy Property schema

Change-Id: I042afdc3b5e3d4677c207e53497e3bcceb6739ad
Merge "Include Description in conversion from legacy Property schema"