Merge "Stop using a regex for setupAppDir."