Snap for 10428683 from f6151f845dd997a9e324388d07b7142c6c346914 to mainline-adbd-release

Change-Id: I8e22f66afbc5eae72fc086bb0f5a613644058398