Merge "Remove appDirRoot argument from setupAppDir."