Merge "Allocate new UID for OTA update resource tracking."