Merge "Use the calling uid, not app id"