Snap for 10453563 from d6112515808f522cc3c4a10f3bdd549873054262 to mainline-adservices-release Change-Id: Ib339f6d0e0e94da4d679c33c66019186ff3263c7