Merge "Revert "Revert "[pm] remove circular dependency in init helper"""