Snap for 10453563 from 76cf1778d456b640986e0ba380c619dfdddf086f to mainline-adservices-release

Change-Id: I53f6a266d19378397ca2075cb77945ec60cffefd