Snap for 10453563 from 8982eba262b52c8300d51876574f8b86951434fa to mainline-adservices-release

Change-Id: I87a6a7e2ad99d8d773afda56cf72c2b839970c81