Snap for 8310876 from 5944bbacc0635ceafd874f3825e629ebcc9f3e21 to mainline-adservices-release

Change-Id: Ifd1018464311adcb585b0314b9876bed326bcae6