Snap for 9254005 from 21007bde51f0f050fa6ebaa9476346857b79e9e4 to mainline-uwb-release

Change-Id: Iee1438de752fc71584103f85a3605e34a048b0f8