Merge "Fix mCachedAssociations for multiple users" into sc-dev