Do not throw NPE when asking for a null propertyId (#10445)

Change-Id: If788d84c66d640368989e443394505600ad12439
Merge "Do not throw NPE when asking for a null propertyId (#10445)"