Merge "Fix PackageManager did not recognize OTA when only upgrade product"