Merge "init: Allow matching empty property values"
am: 79896d8880

Change-Id: I16828742f36141e7553ea33e68c4427bcb005410