Snap for 11174750 from cdc09741206fb925d251feaa137d7e31f4c4ba02 to mainline-adservices-release

Change-Id: I98854d914519e840a2cac5c10dee2b1b643568fb