Snap for 10453563 from 06387f8b991242b15b54a46445407306b5e34764 to mainline-adservices-release

Change-Id: Iab0a5dea6be2ef863d17f48fa79fb0aed7466c06