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