Snap for 10428683 from 110710cfbc382cdbd003780caec188ea9cb22963 to mainline-adbd-release

Change-Id: Ie632b934fad90cbadf9153f7d3ccde601585bc0b