Snap for 8564071 from ecfeee7607781bcdd1139abf162a83c3d2d50c06 to mainline-adbd-release

Change-Id: Ia8569c45221c8d4376b12df696b739889b57b8d0