Merge "Support pm clear as --user." into jb-mr1-dev