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

Change-Id: Icf985abd8fd6ea10a499dbd97b83c57325307e5c