am 06a441de: Merge "Pass along the user id to AttributeCache requests" into jb-mr2-dev

* commit '06a441de3b6756cf49879ff445ac26c66da54d02':
  Pass along the user id to AttributeCache requests