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

Change-Id: I726f6ea2e99f764a41a74e151e1224ea64c3ce79