Merge "Prevent infinite loop when trimming the path cache" into jb-mr2-dev