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

Change-Id: Ia8eb25608f9bb52b497fdb4ede134ce563a74f64