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

Merged-In: Ic652534496edfbe408753f4a04f4daf51cccfc16
Change-Id: I8e81765d063e87d211d1a5bfd509b9096c18a6d7