Snap for 8310876 from 7ac143a3496001b764a3e0e04f2eb1e15af18538 to mainline-adservices-release

Change-Id: Id47f760ce28a4d3b7773ba41139c22c520e63d3c