Snap for 10453563 from 63687023fc2e8871a718cb4e18458eece2e3460c to mainline-adservices-release

Change-Id: I1227d8821f17a9c93b15cad6db31521951d198f2