Merge "Use correct user id to create synthetic path dir" into sc-dev