Snap for 7478028 from a4f050d004b58e5c69a84253e3f007fdbf673e3f to mainline-adbd-release

Change-Id: I38561910ae1adb48716d2220890e9facefe7af0c