Snap for 10453563 from bee1c61bcc963e883cbdae3badcf874bbd36d2d8 to mainline-uwb-release

Change-Id: I10dd2e690fa88ece461451d3e50cb210db65366f