Snap for 8564071 from e177aca7d9e335e8989e592627752459e00df418 to mainline-adbd-release

Change-Id: I7293f2a3b596df42f4b85de7bf94448ac179ec69