Merge "Revert "Remove unused codes that was used in setChildChain""