Snap for 10453563 from 5723accba280f7532fa37483dd2db5fc343c3c0c to mainline-adservices-release

Change-Id: I1dc650911100106763889ebb8f072ea1ac2ced04