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

Change-Id: I7fc1183954f88e036ca39d15b6c51e69fcd52f13