Platform Tools Release 30.0.4 (6686687)
Merge "Snap for 6660490 from 8d79f4b5dead5a59c57a8b0604f0fcc294ce6886 to sdk-release" into sdk-release