aml_adb_331011050
Snap for 8564071 from b22551509f88af77da216f5c36e6c0b428f5fbac to mainline-adbd-release

Change-Id: Ib79a65aa17d71f4f275e9e8161caad7df4760fe3