Snap for 8564071 from 79ece28f29bf9b49a6527daf3e50f80d31065243 to mainline-adbd-release Change-Id: Iae6040aae980e0ce0c946987cc469f0d3ec5b083