Merge "Temporarily change uid to appId" into sc-dev