Snap for 10453563 from 06387f8b991242b15b54a46445407306b5e34764 to mainline-uwb-release

Change-Id: If38fe89c3d21b30664388692c5c118024284d034