Snap for 10453563 from be06080469b07fcb205eb07ac2c795821e1bfcdc to mainline-adservices-release

Change-Id: I63529b88f274d051039ccb96d0323ee99fa36db0