Merge "init: do not impose vendor_init restrictions on old vendor images"