Snap for 8701348 from cbb2e714a2890890991d72b3d8ce86f210c34e5c to mainline-uwb-release

Change-Id: I2cf647bbd32d52951b49acc4b7e1d7d95bed3622