Merge "init: check property type in host_init_verifier" am: e91c76b210
am: 4a5457481b

Change-Id: I4be2f9d9e3ebea1ba28e3ded814132aa20a8120a