Snap for 10453563 from 8cefae833949cddadf7068f8bcab5511329ede38 to mainline-adservices-release

Change-Id: Ie8002c3ca89dc603cbc2016e8aef576652cf02db