Snap for 11041982 from 299ac6f3e7b775e422b3fa02a19cbc25aa5b2c00 to mainline-uwb-release

Change-Id: Icdb88a3c1f7d752a8165bc0816ee273e14a474af