Snap for 10453563 from 34fcaa0dc06597fff16219d2b32fd17dbf4f6c51 to mainline-adservices-release

Change-Id: If6d3334897e55d73b6ef8bc740d0e644f278f985