Merge "remove workaround as vendor_init is ready" into sc-dev