Merge "Allocate new UID for OTA update resource tracking."
am: 1ed1d3dac9

Change-Id: Ic365e6f4084d063363005cd42b66ee0799691031