Merge "Use appId instead of uid"