Snap for 10453563 from 750c37cb48b76444c8fba410aaea44d4f45365de to mainline-uwb-release

Change-Id: I52cfbc77b9c2276c73c7f5fbf94933565b5fab54