Snap for 8564071 from 5f9a90afd9c88cbfd7a1b44669aca3aedf72a24d to mainline-adbd-release

Change-Id: I3c889e82f2f0fd5c768f0b06d61bb860fdd50497