Merge "Rename PackageState APIs from feedback"