Ensure that the property exists

Bug: 64648
Change-Id: Ia4fa64e86286bbd567c4c46e2d79028546ed7e3d
Merge "Ensure that the property exists"