Merge "Add new methods to PkgMgrWrapper for testing"