Merge "Use current user id when invoking omnient." into 24D1-dev