Snap for 10453563 from 3c062c519750095a0dc61dcf036f15d55610917e to mainline-adservices-release

Change-Id: Ib90deb1ac5c6e7c744c21e1193059b29df204522