Snap for 10428683 from bbb101d25e92b5dc80aca428fa355d6e27da9ecc to mainline-adbd-release

Change-Id: I7d7f3abca99dd2f6a4d3aacba47ed56ff856eb30