Platform Tools Release 34.0.5 (10900879)
Merge remote-tracking branch 'origin/upstream'
Import b/312187805