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

Change-Id: I966c620a8bc5071aa94908295a226624b6b9b496