Snap for 10453563 from 59a54a660c9fda3011ce40c7f945b15d19701ef4 to mainline-uwb-release

Change-Id: I1924df61fff62b9c5cba1d5a1e46a7668e9b437a