Merge "Merge "Fixed uninstallPackage" into oreo-cts-dev am: ebacbe3720"