Merge "Do not hang in pm clear on an invalid package name" into jb-mr2-dev