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