combinedroot:Fixed earlier cherrypick of init