Snap for 10453563 from 3e92abfbfe16baad364fafce8b86d28481b2a50a to mainline-uwb-release

Change-Id: I80efc003adecca4b5afd56ed8650044476712043