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

Change-Id: I4bd54913cf5494cfb907ae5072816c2cd5dc30f3