Platform Tools Release 29.0.4 (5871666)
Merge "Merge cherrypicks of [1120805, 1120567] into sdk-release" into sdk-release