Snap for 10428683 from 8d5268645dc18eaa32271113df3b921073778da2 to mainline-adbd-release

Change-Id: Ia394ab333ec9f44710b01a2c1461d964d16484cc