Snap for 10453563 from 6f3875a7c631777c3ce629036716cadaf42c3116 to mainline-uwb-release

Change-Id: Ibe927447176772d8990be5e1bac42cb153003d7d