Merge "Fix the use getContentUriForPath"