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

Change-Id: Id99dd52fca77aa113a60f2f99299d4e2d8f8e18c