Merge "Add missing return statement in setTempFileRootDirectory"