Platform Tools Release 31.0.1 (7187441)
Merge "Snap for 7187421 from 1a5a9044a43e62d7247f51fe0a5d0f3433dbf497 to sdk-release" into sdk-release