Update uls core from upstream

Change-Id: I8e89431ce1f33da2b46826e9e6669cc214c92a4b