Check if property exists in PropertyIdResolver

Change-Id: Ia6760deb3270ff1567e4298e404e3538c7cae3bc
Merge "Check if property exists in PropertyIdResolver"