Snap for 8401988 from 24832cd6d3fa0cfd7aab8ff6e938ce9f64cd9373 to mainline-adservices-release

Change-Id: I3addb194df85dd851c556626af439d1c55064eae