Snap for 10453563 from 6f3875a7c631777c3ce629036716cadaf42c3116 to mainline-adservices-release

Change-Id: Ia9a3be43cd5488f42b40a464e4d49f7d66c5c316