Snap for 10428683 from a5afe506835ea6acd809320c55c578a6292f9d61 to mainline-adbd-release

Change-Id: Iada01779b92ba67af153deda2050bd6961550ac9