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