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

Change-Id: I66c12b6a931c0debfe8b5c3ff22164cba35a21ce