Merge "Fix enlisting files from user 0 and cloned user." into tm-mainline-prod