Merge "Relocate broken getCallingUserId() calls" into lmp-dev