Snap for 10453563 from b4445a27b7d1439a405cc3e8afd71de53639624c to mainline-uwb-release

Change-Id: If04b239131d8f1f30999b79a9484bb156c1e7f34