Merge "Avoid making the user ID dir under system_ce in ATMS" into udc-qpr-dev