Snap for 8310876 from 94ebbc1cbb3ea57fc136f38cce64cc3e6b372b06 to mainline-adservices-release

Change-Id: I2965b370deb1e8c02b6870b622d1db5b9345ca26