Merge "Use correct context when querying package manager" into mnc-dr-dev