Update ULS from upstream

Change-Id: Ic1bcfb82ad433600ebb4896e303f3cf205d384e1