Snap for 9847922 from c7197a13fdeb389d50478e848d4ccae9efee8399 to mainline-uwb-release

Change-Id: I90c2c1efd24529f1613f99b1167db06262a5a70c