Merge "API: getPkg() -> getPackageName()" into jb-mr2-dev