Merge "Get correct user's package info during clip processing" into jb-mr1-dev