Merge "init: degeneralize subcontext init into only vendor_init" am: 0b4f560f87
am: f4cc94a0cf

Change-Id: I314b7c2d07a87804624e0ed45dd6fdb6c056a874