Platform Tools Release 30.0.5 (6877874)
Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I602373f15230605028687b442f0ed7f98131614a
Change-Id: Idc2ae4ddcfbb90ad98cf895924dac602b9ec5d5e